Fixed a coupe of bugs and removed unnecessary this statements.