Clean-up

closes #351