PEP8 Syntax recommendations, removed unnecessary returns and if quotes.