Clean up and follow code conventions
Merge pull request #690 from gasull/cleanup-ignat99-feat

Cleanup ignat99 feat