fix formatting mess
merge to fix formatting mess