Cleaned layout