Code cleanup... Thanks wthit56!