Tiny code refactoring, Again.