Cleaned up creation of responses