Refs. #15. Style improvements.