CLEAN: code movement and comments