A few comments, lots of reindenting/cleaning up