Fix for clarity usage of ES5 usage on block level identifiers

* Automatic white-space editor cleanup

Auto-merging