Create Some Helpers

This is just some cleanups of some functions that already were there,
but neeeded some a bit of improvment.