cosmetics: code reformatting
tests fixed