Cleaned up and documented a few more classes