Code beautification and adds some fields to utils