cleaned up service.c.java