Minor improvements for Noobia on Merung's feedback.