Addressing Review Comments
Fixing #if define