delete unnecessary this usage, delete white space, changed local variables to be final