Cleaning up unused variables - adding comments