- Removed unused member
- Simplify code