Consistency cleanup based on github comment feedback