Cleanup based on JSHint suggestions