modified variables order to ensure pkglint conformity.
TODO list done
forgot to add MESSAGE