Clean code and better display