Avoid storing unused instance state.
Add more descriptive comment