Refactor assignment lines