Remove duplication
Improve layout