More refactoring and code tidy in regions