[de] small code cleanup / optimization