Reformatted code to be in-line with the codebase