Added responses
Cleanup code