Code refactory with command handler