further code clean-up, including nice alignment