Some more cleanup on Assignment and Factor
Created sweep method for Assignment