Refucktor a bit more