Abstracting rest services
Cleaning up