Cleanup

References #144