commenting and clean up