Minor formatting
Minor refactoring