Pr 43 cleanup

Cleanup of #43