Tiles config, minor refactoring