Cleaning code and default layout