Refactor is working :)
Working with the view