Moved utility things to a utils module