Cleaned up IMC code
Merge pull request #1199 from ddoggy99/master

Cleaned up IMC code