Updated for code review

Note: As I mentioned, there is no changes for Norvig algorithm related modules(Ronald is working on that).