Some cleanup. New methods.