clean-up
Script is less verbose now