Fixed Review comments and useful PEP8 feedback