Refactoring/Cleanup
Bugfixes/Cleanup