Reformatted code to updated coding convention