Refactors boolean returns

Return the boolean evaluation itself rather than
a boolean after evaluation

Change-Id: I6329d474c921e29eb3a690270de12d51cb863710