Remove duplicated code, fix comment, fix bool
Remove duplicated code, fix comment, fix bool

Tayamarn/socorro,Tayamarn/socorro,mozilla/socorro,lonnen/socorro,Tayamarn/socorro,mozilla/socorro,lonnen/socorro,mozilla/socorro,Tayamarn/socorro,lonnen/socorro,mozilla/socorro,mozilla/socorro,lonnen/socorro,mozilla/socorro,Tayamarn/socorro,Tayamarn/socorro