Code improvements in Common Utils