Some code cleenup.