cleaned up more formatting