Cleaner and leaner code