Clean up

added common flags