Fix various minor formatting issues