@mzikherman => Slight refactor