Fix typo

TODO: Add clean up routine