Create the entity class and cleaned the code.