Reformat some code.
Small refactoring. Remove some unnecessary lines.