Merge "Removing duplicated code"