Minor improvements as requested