cleaned up classes and added better comments to method comment blocks