Luke's commit at MIT

Refactored some code, added comments