EntityCaps: Javadoc, whitespaces fixes, small refactoring