Housekeeping cleanup

Still need to do comments and check against Dave's standards.