Housekeep commit
- Extract user-facing text to resource files
- Other Cleanup