Yet code improvements