foo
Minor refactoring