fix bad import and minor cleanup