Refactor based on draft actions proposal