more conventions cleanup