Updated formatting and general spacing..