[~ENHANCEMENT] small code cleanup