Mild refactoring, reduced warnings in tests, refactored int to letter method