clean up code

[smitjuli]

this branch reviewed code and made sure it had proper comments and indentation hierarchy for easier human readability