Refactoring common code
Trying out view abstractions