Cleaned up some unnecessary code and comments. Fixed __str__ methods to be more clear. Tests still pass.