basic refactoring done, not everywhere but enough to give examples [KFSQA-832]