cleaned up code a bit; commit before winter break