Cleanup, comments ...