Documentation: Util
Cleanup code a bit