Refactor
Remove commented code.
Refactor.
Tests.