General cleans at right parts of the code