Fix code linting issues