Consider a general refactoring of code

[samanthacsik]

Code is pretty chaotic. Needs a fair amount of organizing + cleaning up old code comments.