formatting for Batch documentation
code clean-up in tests