*ExtraCommands: Code cleanup