Unified formatting and importing. Added missing javadoc.