- Merge the Aggregators' code inside "StatsServiceImpl.java". - Remove the Hystrix related code, since it wasn't really used. - Add exceptions-handling and error-checking.