Tidying of settings and ignore file