update base, style cleanup