Follow up to last commit.
- Code reworked.