Addapted the motions options variables to the code styling