Reformatting and more command implementation.