Little view refactoring in data module