some formatting
code clean up
blah
update for new jet cats