Minor Refactoring Changes