Nitpicky improvements