Reference conventions cleanup