PEP 257 Fixes

Build should finally pass. Merge #4 first.