Just an en passant refactoring