fixed more lint warnings