Cleaner code!