Some clean of code