Reformatted a few classes