Code review

I've reviewed the code following the PEP8 coding style when applicable