Refactor duplicate codes #2