Small OPT and DOC Fix

OPT: use proper constructor/attributes

tests pass