minor layout change, unused imports