- Refactor namespace, function and class names
- Updating comments