Refactorin view