Util package was misplaced
Spaces, not tabs
Normalize line endings