Some refact in Utilities