Continuing code cleaning