cleanup docs, made constant names more consistent