Consistency review

Feedback