Minor patch
Minor refactoring