misc style improvements