doing some minor reforamtiing while we touch these files