Tidy of Entities class