- Code cleanup 1
- Code cleanup 2