Cleaning up IoC extensions and commenting