More cosmetical changes to the API