Code clean up

We don't want the prof to see unsightly +uncommented spaghetti code...