refactoring (more pojo'ed pojo)