Cleaner looking return logic