[46] Small code cleanup