Yep, I just tried to keep the code consistent. +1 for a code refactoring in a next commit.