fixes for control.js formatter
Merge pull request #667 from rmehta/fixes-july-2

fixes for control.js formatter