lint and minor cleanup