Minor style update
Minor refactoring
Minor fix