Further refactoring
Refactoring of reciter