Small code cleansing