Modification(s):
- Code refactored.
- Removed previously kept commented old code parts.