Basic code cleanse for consistency