Rework from comments