more cleanup to reduce lines and clutter