Fix various formatting issues