This entire if/else block can also be removed I think.