CORE-5460: Messages when attempt to run app with no tool now consistent
Other minor refactor and code cleanup.