Clean-up
More default values are entered programmatically