Closes #1

Cleanups