Removed old comments
Reword a few things