Cleaned up formatting a bit