Cleaner layout