Tweaks for code formatting and JSHint validation