Cleanup and move functionality to classes
Take repo for response message