Fix Block Data

[czaloj]

Code is thrown everywhere, default value initializers should be in headers, property organization.