cleanup and commenting
commenting