Refactor Google Command