Some code cleansing