Issue #14: fixing formatting on ids and names