Cleaning up the interface to get it ready for the 1.0 release