Minor changes
Minor refactorings