Reformatting some classes