Small refactor.

Everything works!