merged up formatting
spacing