Minor changes.
Refactored to clearder byte array parsing impl.