A bit of code cleansing