Tidying classes in src/utils