Code style
Refactor views