Clean up

Silly changes. Fixes #3