Cleaner Code :)