Some refactoring for consistency