Code changes

small update on code readability and PEP8