Reformatted code, underscore case used