Splitting Crossword into concerns and changing some method names