Code much cleaner