Cleaned up coupling for the utility classes