Cleaning up pull request.
Cleaning up API to show multiple params better.