change some commenting and organization