Reorganized code, removed unnecesary methods, removed some comments, added comparison functionality, and tests