jshint and code style stuff

Change-Id: I8d30c252793ba0d0c01e4e737b5fd1cecd39a9a1