Much Cleaner Code