APIs a bit cleaner