Add title (tooltips)
Clean back-end code