style adjustments + clean out unused code