minor changes to simplify printing