Done refactoging stage