replaced conditional variable declarations with explcit ones to simplify building