A few convenient methods and small cleanup