Cleaning up some respond_to syntax to simplify things