Fixed bug with single-letter cubes + refactoring;