fix some formatting issues revealed by lint