Refucktor a bit