Assignment refactor

Created by: sebkelle1

This is a code simplification of the SFC-assignment in preparation for locally essential trees.