Fix wrong property init
Rearrange properties
Sort private properties properly