Clean back-end code
Clean back-end code