API cleanup
entity view javadoc updates