[TASK] minor adjustments / cleanup