Update & Clean

Closes issue #12.