Refactor

Fixes #1