Updating views and refactoring.