Some more refactoring

by roundabout, Tuesday, 25 June 2024, 14:00:38 (1719324038), pushed by roundabout, Tuesday, 25 June 2024, 14:01:57 (1719324117)

Author identity: vlad <vlad.muntoiu@gmail.com>