Minor refactoring

TO DO:
[ ] Fix client data calls (waiting for back-end specs)