minor edits, got rid of getName()