Change class variable to constant
Change an each call with shovelling into an array to a map call
Change map! to map