same as below. Also not sure if we should do refactors like this in this PR unless it required for JShint