code cleaning mostly