Master

This PR includes just some minor cleanups that should not have any impact on the functionality
It does work, but i never saw nothing like that before. The way a default arg is usually set is `escape_fn = escape_fn || default_escape_fn;`. I don't understand this logic because the sets the default only when the `escape_fn` is identical to true and undefined is not true neither a function. 

By reading this code i thought that  this line would never be executed but it is being executed and it is working fine that is what confuses me.