replaced explicit names by variables