Improved code quality and tests
Renamed position into pointer