Added AJ sugestions for C codebase