Reformated code to meet conventions pass1