BIG CHANGE on services standards returns + checkstyle