more cleanup
middle sites with cleaned up code
almost done with first (second) row