Apply most of @tridge comments