Cleaned up BaseUtil class and related files