Improve code documentation
Sort members