More command refactorings + cleanup