Yeah I agree we probably should have a set of common tools to handle 
this repetitive stuff in one place and make all utils use the same 
code/behavior.