Small Changes

Just some small code changes, PEP8 and readability.