Cleanup (Issue#15)