Renamed a field and a function.
Added remark that a map has been defined.