Merge "Re-factor some duplicate code."