simplify and rework

[none]