Bugfix, Cleanup.