Code style & language corrections in src/Entity