Few more formatting issues