[IC] general cleanup
[IC] general cleanup
Merge pull request #68 from loadedcommerce/D845

D845