Cleaner logic indeed! 

Fixed