Add usage and clean up the API a tiny bit