API review refactorings