Added a static Utils class for commonly used methods.
More clean up.