Refactoring / Cleanup

nothing major, mostly moving stuff around and deleting comments