Improve the consistency and the documentation