Few more formatting corrections