r27: code cleaning