I changed my mind :p
Minor refactor