Comments removed and indentation corrected