refactoring with scoop layout to support more commands and better help