updated following pep8 guidlines