cleaning up utility helpers