Reformatted code to match coding standard