Clean code

Clean move to XY