Reduce [if ]-statement rendundancy