Minor code clean-up - changed some comments, removed some unnecessary vars