Reformatted code to match rest of the framework