Address the simple review comments
Replaced the bitfieled by an enum and refactored the streaming parser's logic