Clean code and styling