Removed a few unnecessary lines (there is a False check later on that is executed regardless of the logic branch that is taken)