Cleanup code for CLang compiler

Fixes #9