Minor changes; less verbose.