More spacing and formatting