format fix; remove shared variables