Merge "Cleaning up a duplicated code"