make variables and function names more readable and try to fix problem with vehicle change probability