removed unnecessary __name__ calls