Second Commit

Includes some cleaning of code (e.g., removing comments and unused
variables)