Revert "Format the code so it looks pretty; add javadoc stubs"

This reverts commit ce0394520631e596c103ed1edd4c1eaa2e2ac1d2.