refactoring entity/orm and docblocks