Rearrange and reformat to keep pycharm happy.