Fixed mini-bug and useless statement