Utils cleanup, comments and fixes