fix formatting
remove cruft
remove cruft