Review Code

[scarnecchia]

The fact that this is still running despite my neglect is nothing short of a miracle. This issue is to review the code and suggest revisions.