Cleanup, specs, comments