Remove extra whitespace and unused var