Cleanup variant component for issue #10
Cleanup algorithm component for issue #10

Close #10