removed redundant value conditions from variables