cleanup and added commander
added in prompt