Cleanup - fixing various formatting issues