Cleanup, closed #74