A bit code and comments cleanup