Objectize row arrays

@ngallagher87 

Turns row arrays into objects. Also cleans up trailing whitespace.