Reformatted classes to align with a common style