#NO_ISSUE some refactorings