Fixed more formatting stuff