@spyl94 first try for refactoring not easy