View refactoing