Please, do not move things around. It is much harder to understand the changes/code review. You can create another pull request for restructuring/restyling the code. But not do both in one.