[TASK] Clean up and finalize the REST controller