Composer: simplify code with early returns
Composer: Rework formatting bar logic