Cleaning up the code and fixing up a few defaults

Hey Suteerth,

remember me? Vedant, your classmate. Found your GitHub. Thought I'd contribute. :)

Cheers
Vedant Nevatia