Optimized

- removed underscore
- removed global namespace pollution