style cleanup. remove some underscore-specific features