Fixed indentation and parameter types in util package