Readded OSUtil and changed some formatting