some alignment and clean-up