Adjusted code layout.
Fixed symbolic names.
Fixed incorrect size that lead to undfined read values.