Restored configuration
Tidying