Refactor: Some refactoring changes.