Tidying up and improving configuration files