Opting for a cleaner approach