Issue #59 Updating as per review, adding param description in javadoc, modifying to use long instead of Long, removing /** style comments inside functions etc