refaktor little bit