Minor client side fixes

We have a few unused variables and weird indentation, not sure how that happened.