Improved API structure
Whitespace