Added comments and cleaned-up code

Removed unused references