refactoring and code consistency.