Condense "if" statement, set default to "false" & tidy comments