Cleaned up and commented a few more classes