Small code cleanse