Keep critical sections as small as possible
Improve output more