sorted out spacing and formatting