Style change: one var declaration per require
merged with refactoring branch