Fixed more formatting problems