Remove duplication
Improve layout
Optimize for production