RelayCommands refactoring