[TE] Common classes reformatting.