updated and tided up formatting a bit