Fix clean problem and tidy up

[haoxianhan]

1. the clean problem : It's easy to reproduce when using clean hook, just fix it by commit.
2. tidying up the verbose arguments and functions.
3. fix lots of repetition include opts