Fix alignment of before/after. Closes #1