bin/kamerling: minor variable renaming
wrap long method defs
wrap/shorten long lines