start of code cleaning