Code clean up
Unit testing Util spec