Display/Entity documentation/refactoring