Reformatted code, all classes have uniformity