Minor refactor but much cleaner