Clean-Up
Clean-Up
Changed system utils to use implicit classes