Removing use of Pair object / implementing changes requested from code review