Turned off commenting for now
Minor formatting update