Refactor Position to Square