Refactor: Code tidy.
Refactor: Rename component.