Add #not_nil?; refactor class names; commet methods