overall alignment clean-up