Cleanup API a little bit more