Refactor

Refactoring to use internal X and Y to avoid possible confusion.