Updated comments and made some tiny refactors (mostly name changes). INCLUDING test stuff
Removed test stuff