Responses to @ludwigschwardt comments in PR34