Made Utility classes' methods as extension methods wherever possible and minor code cleanups