refactoring tweaks by commands