All pages updated - code cleaning is in process