fixed formatting/imports
added missing javadoc