+Minor utils
Minor modifications (formating)