Refactor

Resolves #1