Clean up

Cleaned up a few method names and made calling the API a bit neater.

Updated samples.