Create EntityFactory for easier creation of entities
Clean imports and unused variables