I would rather keep refactorings to separate commits if that's alright. Easier to track.