code polishing

Used "map" over collection, moved constant to package level