Formatting
Remove duplication from views
Merge pull request #1 from gcapizzi/master

Remove duplication from views