Reformatted Code to stick to the Convention