Clean up the move set creation functions