Bugfix, cleanup
Cleanup