Removed Unused Variables and Correct DocBlock