yay for formatting fixes
more cleanup
final cleanup