Improvements after running through JSHint