Cleaned up command list so it will run properly