Cleaning up unneeded methods
Fixes #23
Changed class arrangement to improve code readability
Fixes #16
Closes #16