code cleaning :bath: