added lints and minor changes