Code refactoring (API style)