code clean up and more 'use strict'