Remove unused code and set multiple vars per function.