Minor: Reorganized commands and output.