Improvements based on @tribal-tec review