improving waiting time and code quality
updating setup.py