Reorder properties
Improve README