Little code rework