Pacakge requirements in setup.py updated.

Also refactored little bit to comply with PEP8 standard.