Quick sample cleanup

Closes #12