fixed indentation and commenting