Checking for empty variables
Added unit literal optimization