Fixes #5 | refactor