Refactored X and Y coord adjustment into helper methods.
Moved x and y move logic into separate methods.