format changes, redundant removals