Some changes due to PEP8