make includes coding convention compliant
remove race condition for good