A cleaner api