lint and minor cleanup. sorry for the jumble