Fix more whitespace weirdness
Remove unused variables