Minor: would be good to have `/** .. */` style comments for consistency