Cleaning up API namespace