Cleaned code and improved communication with SLA Collector