Changed commenting and indentation