Refactored unneeded hash with k,v
Styling