Clean up of MeterReadingService + javadoc start