a bunch of cleanups

Signed-off-by: Greg Dietsche <Gregory.Dietsche@cuw.edu>