Added --noinput option and tidied up the clear out. Fixes #3.