CLEAN UP ALL THE THINGS

Fixes #6