Pr/72

Cleaned up PR #72