More API cleanup and documentation