Anvil. Suite's code refactoring