Rework the entity declaration

when expanded they will look better (as when the file was not split)

While here cleanup some indentation