Made some changes to conform the PEP8 standard