- Code cleanup
- Added more string conversions