Refactored variable names, added explicit type declaration
Fixed the move being the same every time