Refactor finished assignments