More changes according to JShint.com