CLEAN: Reformated and optimized