Refactoring, automation and more reworking