made function names more generic