Add javadoc, remove unneeded part of return. Closes #6