Lint cleanup

Prevent "warning () interpreted as grouped expression" and remove two
unused variables
Merge pull request #3 from AD7six/feature/lint-cleanup

Lint cleanup