A refactoring with 2 views and validation