Comment cleanup / fix. #201