code cleanup - use less static variables
enum defaults for JPA entity classes