PEP8
Remove debugging code
Complete parser