Fixed more formatting bugs