deleted useless comments and fixed a few curly brace style problems missed from last time