Vikram Menon/vikmenon

Cleaning up submitted code.