Minor cleanup
Minor refactoring