Refactoring:

 - Make code consistent with master