API cleanup and documentation update