Refactor to respect CI as remote origin