Small fixes, cleanup, and PEP 8
Merge branch 'maurycyp-master'
merge