Switched code to use proginal author's conventions.