Nice messages priting and some refactoring