Cleaner and more consistent