Fix Javadoc problems in Activity.java, reformat