Clean API classes

- Improve coding style