Minor refactoring
Minor formatting fixes