Tidying up code base

- Removes unused variables in match
- Remove unnecessary parenthesis