Fixed codestyle of entities