Dummy batch_status type added
trivial renaming and comments