Kis code cleaning.