Code cleanup in bitstream code. Lower case variable names, less code. Change-Id: I1abc8f592ad2343ab5c76fe2d16262741a4a894a