Refactor generator python scripts