JSHint cleanup

Clean up code to make JSHint happy