commenting/cleaning
conditional formatting fix