uimanager cleanup, fixed jshint warnings