Some JSLint changes to help readability