Removed empty statements
Removed unused method overrides
renamed some parameter casings