1. More comments
2. Move TrendServerBuilder into companion object where it should have been all along