API homogenization and cleanups