API cleanup, with better examples