Few changes following @saxamaphone69's feedback. #932