Revert "Code refactoring (API style)"