formatted code
removed unused components
renamed Util in Strings