Reorder properties
Fix style