Util standardization, cleanup