Smaller improvements as suggested by @normanmaurer