Made some changes in order to comply with PEP8.