cleanup for pool related commands
review comments fix