bunch of random refactorings to different commands