Removed duplication of move calculations