Cleaned up code.  Adjusted default duration