Fixed #60. Also style changes.