more code massaging
even more massaging