Some refactoring
Some refactoring
Some refactoring (again)
Some refactoring
Created View mechanism