More style bothering

Some consistency and jshint-compliance