cleaning various formatting issues