Alignment lines. Cleanup, refactor Baseline.