cleaning the code according to git comments.
Merge remote-tracking branch 'origin/feature_rational' into feature_rational