Revamped conventions, tests, and javadoc