Cleanup, bugfix