Cleanup and better interface on insta-client