dont create temporary variables and fix up formatting a little
dont create temporary variables and fix up formatting a little

copiousfreetime/chronic,mojombo/chronic,davispuh/chronic,j-hernandez/chronic,CraigCottingham/chronic,lautis/chronic