Refactor: Tidy code.
Refactor: Tidy code.