Code refactoring
Add bitstreaming support
Cosmetics