*clean up, clean up, everybody clean up...*

now that this is the primary branch and we don't need to stay in sync with the old meteor branch, i fixed the formatting to be consistent and removed unused code. lemme know if i got rid of anything i shouldn't have.