Cleaned up code more
Cleaned up utilities folder