Reformatted the code to comply with the newly adopted coding conventions