minor tidy up of various entities (IntelliJ regions, consistent use of JDO annotations, fully qualified)