cleanup and adding clarification.