Cleaning a little bit of the global code.
API are ready for prototyping tests.