Bugfix/Cleanup