Sure. I suggest to create issues for the refactoring stuff that you don't feel belong to the scope of the PR. Most of it is pretty small and the biggest issue I see is not forgetting to do it later on ;)