Improved Consistency

with other files