Reorder methods
Improve documentation