#252, #158

js lint issues fixed