Cleaner layout.