[confluence] - removed some unneccessary checks

small cleanup for confluence.
basically exchanges

if (condition)
{...}
if (!condition)
{...}

with

if (condition)
{...}
else
{...}

on some occasions.