Cleaned up some code and added some javadoc
Merge pull request #7 from katharinebrinker/master

Cleaned up some code and added some javadoc