- code cleaning and review