fixed some commenting issues and indentation