changed the solution not to be so condensed
removed an unecessary method toNONE