Refactorings after a code review session with Nekitu.