refactor stork