cosmetics: split lines and code alignment