comments removed and indentation done