Swapped out a bunch of the middle lines
Removed commented out code
convert the bottom row to new syntax
Autoformatting