Remove checks for seconds argument

Tidyup the code somewhat 
Add proper exit clean