Just cosmetic changes.
Remove useless code.