Removed now unused variables, removed additional space after a tab character.