Neatened API a little