Removed unnecessary this statements. Fixed other formatting issues.