Fixed more formatting issues