converted to camelCase, added a few doc-strings