Cleaned up code into utilities