Merge "Remove code duplication"