cleaning up a bit - not more API
small cleanups from kimapi