Clean up and added escape-time option