Refactoring and "fixing" rearranger.
Running reformatter.