004: functions cleanup