cleanup , and added comment
removed old comments
renamed bad name