mitar and formatting fix