cleanup, create reuseable util class