Minor refactoring
Minor refactoring
verb++
minor modifications