Position refactoring