Cleanup API a bit