Format the code so it looks pretty; add javadoc stubs