Refactor Position class/object