[#1824] small refactoring around conditionals
[#1824] small refactoring around conditionals

tomclement/RapidFTR,rapidftr/RapidFTR,sorashiro/RapidFTR,mwangiann/RapidFTR,sorashiro/RapidFTR,timothyakampa/RapidFTR,rapidftr/RapidFTR,sorashiro/RapidFTR,ctumwebaze/RapidFTR,sferik/RapidFTR,timothyakampa/RapidFTR,ctumwebaze/RapidFTR,sferik/RapidFTR,austiine04/RapidFTR,austiine04/RapidFTR,sriprasanna/RapidFTR,tomclement/RapidFTR,tomclement/RapidFTR,timothyakampa/RapidFTR,sriprasanna/RapidFTR,rapidftr/RapidFTR,austiine04/RapidFTR,tomclement/RapidFTR,mwangiann/RapidFTR,ctumwebaze/RapidFTR,sorashiro/RapidFTR,sriprasanna/RapidFTR,austiine04/RapidFTR,sriprasanna/RapidFTR,mwangiann/RapidFTR,timothyakampa/RapidFTR,rapidftr/RapidFTR,mwangiann/RapidFTR,ctumwebaze/RapidFTR,sferik/RapidFTR