- Fixing project warnings
- Code cleanup