Refactoring and rearranging.