Remove unneeded check and rename Boolean for clarity