Code Clean Up

Fixes #10