Renamed UserName to Username for consistency

Fixed use of change "Username"

Shorted for loop to deal with key and value
Named key and value variable

Fixed key, value error