Minor refactoring
Minor changes.