removed extraneous bump and generally cleaned up