Refactor!
Forgot to readme, as usual