Remove util class. Invoke methods more java style