Basic code clean