little cleanup and commenting