Cleaning up this. use

Closes #479