- Minor changes
- Code clean up