Cleanup
Bugfixing