basic clean up turned a few other things into classes