Removed unused parameters and methods as well as added comments to
methods