Make jshint happier
Refactor expression properity generator out of loop (make jshint really happy)