Made layout cleaner