Continue moving around, reformatting, refactoring.