clean up, javadoc, @View annotation