More changes / refactor